x86: Small APIC timer initialisation cleanup

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index 248d373667cf40dca43799fab30a354b5e98cb25..c21811f0d50489635056ea700110a174017a9de6 100644 (file)
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -1064,11 +1064,11 @@ static void __setup_APIC_LVTT(unsigned int clocks)
     apic_write_around(APIC_TMICT, clocks/APIC_DIVISOR);
 }
 
-static void __devinit setup_APIC_timer(unsigned int clocks)
+static void __devinit setup_APIC_timer(void)
 {
     unsigned long flags;
     local_irq_save(flags);
-    __setup_APIC_LVTT(clocks);
+    __setup_APIC_LVTT(0);
     local_irq_restore(flags);
 }
 
@@ -1159,8 +1159,6 @@ static int __init calibrate_APIC_clock(void)
     return result;
 }
 
-static unsigned int calibration_result;
-
 void __init setup_boot_APIC_clock(void)
 {
     unsigned long flags;
@@ -1169,18 +1167,16 @@ void __init setup_boot_APIC_clock(void)
 
     local_irq_save(flags);
 
-    calibration_result = calibrate_APIC_clock();
-    /*
-     * Now set up the timer for real.
-     */
-    setup_APIC_timer(calibration_result);
+    calibrate_APIC_clock();
+
+    setup_APIC_timer();
     
     local_irq_restore(flags);
 }
 
 void __devinit setup_secondary_APIC_clock(void)
 {
-    setup_APIC_timer(calibration_result);
+    setup_APIC_timer();
 }
 
 void disable_APIC_timer(void)

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index aec3b100a0080ba44b55c35077fa314110ed4b41..6c007afbef4951b81f0412ac48e5375ca3a20a10 100644 (file)
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -348,7 +348,7 @@ void start_secondary(void *unused)
     construct_percpu_idt(cpu);
 
     setup_secondary_APIC_clock();
-    enable_APIC_timer();
+
     /*
      * low-memory mappings have been cleared, flush them from
      * the local TLBs too.